From: Kenichi Handa <handa@m17n.org>
Date: Mon, 1 Nov 2010 07:55:44 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5835^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6ecbb08744e7842605754c448d202ac62db753e8;p=emacs.git

merge trunk
---

6ecbb08744e7842605754c448d202ac62db753e8
diff --cc lisp/ChangeLog
index 4d8c08e4e90,79f68b2a2c7..fb84bb64791
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,19 -1,10 +1,24 @@@
 +2010-11-01  Kenichi Handa  <handa@m17n.org>
 +
 +	* faces.el (glyphless-char): Inherit underline for tty.
 +
 +2010-10-28  Kenichi Handa  <handa@m17n.org>
 +
 +	Implement various display methods for glyphless characters.
 +
 +	* international/characters.el (char-acronym-table): New variable.
 +	(glyphless-char-control): New variable.
 +	(update-glyphless-char-display): New funciton.
 +
 +	* faces.el (glyphless-char): New face.
 +
  2010-11-01  Glenn Morris  <rgm@gnu.org>
  
+ 	* calendar/holidays.el (general-holidays, oriental-holidays)
+ 	(local-holidays, other-holidays, hebrew-holidays, christian-holidays)
+ 	(islamic-holidays, bahai-holidays, solar-holidays): Move aliases before
+ 	the definitions of their targets.
+ 
  	* emacs-lisp/smie.el (smie): New custom group.
  	(smie-blink-matching-inners, smie-indent-basic): Add :group.